So this patch seem to affect when _WIN32/_WIN64 are not defined, i.e. Linux for example?

Yes Linux works fine with the default <capstone.h>
windows appears to need capstone/capstone.h

Can pkg-config to add the correct include path maybe, then we can only use <capstone.h>?

No idea how that works. But if it works then sure.

I'm actually working on build recomp for ARM macs, so this will be interesting the merge

But for pkg-config, here's what sm64 uses in their makfile:

`pkg-config --cflags --libs capstone`

So, you'd have something like

$(RECOMP): recomp.cpp elf.h
	$(CXX) $< -o $@ -std=c++11 -O2 -Wno-switch `pkg-config --cflags --libs capstone`

if you're still using the python build script, i'd guess you shell out to call pkg-config